From: iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Date: Thu, 24 Jun 2004 15:13:59 +0000 (+0000)
Subject: bitkeeper revision 1.1015 (40daefb7Yxmwg11WTNOJcj2lzrnQcA)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18106
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=b0036a3929a482aae2d150059f506b9ea0760afc;p=xen.git

bitkeeper revision 1.1015 (40daefb7Yxmwg11WTNOJcj2lzrnQcA)

trivial
---

b0036a3929a482aae2d150059f506b9ea0760afc
diff --cc linux-2.4.26-xen-sparse/arch/xen/Makefile
index 705dc41a9b,44fe201bc5..a92009805d
--- a/linux-2.4.26-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.26-xen-sparse/arch/xen/Makefile
@@@ -16,16 -16,12 +16,12 @@@
  #           Added '-march' and '-mpreferred-stack-boundary' support
  #
  
- override EXTRAVERSION := $(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAVERSION)
+ override EXTRAVERSION:=$(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAVERSION)
  
- # This following is pretty horrid, but I think the ends justify the
- # means: if no .config file exists copy the appropriate defconfig-XXX
- # file to .config so that we use it in preference to the plain
- # defconfig file. It would be much better if there was a hook in the
- # main Makefile to do this, but this works.
+ # If no .config file exists then use the appropriate defconfig-* file
  ifneq (.config,$(wildcard .config))
- X=$(shell cp $(TOPDIR)/arch/xen/defconfig$(EXTRAVERSION) $(TOPDIR)/.config)
 -X:=$(shell cp arch/xen/defconfig$(EXTRAVERSION) .config 2>/dev/null)
 --include .config
++DUMMYX:=$(shell cp $(TOPDIR)/arch/xen/defconfig$(EXTRAVERSION) $(TOPDIR)/.config)
 +-include $(TOPDIR)/.config
  endif
  
  LD=$(CROSS_COMPILE)ld -m elf_i386